From: Dan Winship Date: Wed, 3 Aug 2011 15:12:32 +0000 (-0400) Subject: shell: fail cleanly if XFixesGetCursorImage fails X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~7989 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=3dc07d48c53146b4b936a35967fd700b3a54a611;p=gnome-shell.git shell: fail cleanly if XFixesGetCursorImage fails from Mageia, via Olav Vitters https://bugzilla.gnome.org/show_bug.cgi?id=653119 --- diff --git a/src/shell-recorder.c b/src/shell-recorder.c index 0171045de..9df14d3ea 100644 --- a/src/shell-recorder.c +++ b/src/shell-recorder.c @@ -393,6 +393,8 @@ recorder_fetch_cursor_image (ShellRecorder *recorder) return; cursor_image = XFixesGetCursorImage (clutter_x11_get_default_display ()); + if (!cursor_image) + return; recorder->cursor_hot_x = cursor_image->xhot; recorder->cursor_hot_y = cursor_image->yhot; diff --git a/src/shell-xfixes-cursor.c b/src/shell-xfixes-cursor.c index 0da2397c6..6507d19a8 100644 --- a/src/shell-xfixes-cursor.c +++ b/src/shell-xfixes-cursor.c @@ -202,6 +202,8 @@ xfixes_cursor_reset_image (ShellXFixesCursor *xfixes_cursor) return; cursor_image = XFixesGetCursorImage (clutter_x11_get_default_display ()); + if (!cursor_image) + return; /* Like all X APIs, XFixesGetCursorImage() returns arrays of 32-bit * quantities as arrays of long; we need to convert on 64 bit */